pygrub/xend: Fix console plumbing to xenconsole client.

Domain's console tty now lives at serial/0/tty in xenstore.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/python/xen/util/diagnose.py b/tools/python/xen/util/diagnose.py
index e31f396e730dfeaf408fdc7018ed1faa67db25ad..b857e2d7401443fb979bf584c5ef6e439d69bbdf 100644 (file)
--- a/tools/python/xen/util/diagnose.py
+++ b/tools/python/xen/util/diagnose.py
@@ -77,7 +77,7 @@ def diagnose(dom):
 def diagnose_console():
     port    = xstransact.Read(dompath + '/console/port')
     ringref = xstransact.Read(dompath + '/console/ring-ref')
-    tty     = xstransact.Read(dompath + '/console/tty')
+    tty     = xstransact.Read(dompath + '/serial/0/tty')
 
     if not port:
         print "Console port is missing; Xend has failed."

diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py
index 74c9a2ac196a8110a32d0331a91bb90dd9ac4822..0cef917358e21a47169c3b634b0b89ebf499529d 100644 (file)
--- a/tools/python/xen/xend/XendBootloader.py
+++ b/tools/python/xen/xend/XendBootloader.py
@@ -85,7 +85,7 @@ def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '',
     fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY)
 
     slavename = ptsname.ptsname(m1)
-    dom.storeDom("console/tty", slavename)
+    dom.storeDom("serial/0/tty", slavename)
 
     # Release the domain lock here, because we definitely don't want 
     # a stuck bootloader to deny service to other xend clients.